Revision: tla-tools--devo--0--patch-51
Archive: miles@gnu.org--gnu-2004
Creator: Miles Bader <miles@gnu.org>
Date: Mon Apr 26 12:36:20 JST 2004
Standard-date: 2004-04-26 03:36:20 GMT
Modified-files: ChangeLog tla-fix-changelog-conflicts.shpp
New-patches: miles@gnu.org--gnu-2004/tla-tools--devo--0--patch-51
Summary: tla-fix-changelog-conflicts: Add support for inline conflict markers

Such as produced by the --three-way option.
